Fast-Forward merge